Fix extend schema from #1314 #1323
+110
−52
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.